Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 02:25:40 +0000 (19:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 02:25:40 +0000 (19:25 -0700)
commit128ed0751c290f8565dacf34b6cc148bb867b837
tree2220b2ec464a4237c0505ee9cb2d33fd05ed664d
parent77ec94b0c228f3379eeb6b08287de79ece465240
parent83fa3ba5fc946eaa6c8369773f852da00c01561b
Merge from trunk.